OR-FGEMF-20 Fix